Add missing case.

Thu Jul 12 14:06:19 2001  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Add
	missing case.

	* gtk/gtkcontainer.c (gtk_container_get_focus_chain): Fix
	NULL/FALSE return value confusion.

	* gtk/gtkrange.c (coord_to_value): Fix division-by-zero
	problem when scrollbar completely fills range. (Patch
	from  Matthias Clasen, #57047)

diff --git a/ChangeLog b/ChangeLog
index 152ee095f512451866b7b46f1566ca584578cedb..b0fe0d9b42afcca7d12472faf5d4db90ffa688d7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Thu Jul 12 14:06:19 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Add
+       missing case.
+
+       * gtk/gtkcontainer.c (gtk_container_get_focus_chain): Fix
+       NULL/FALSE return value confusion.
+
+       * gtk/gtkrange.c (coord_to_value): Fix division-by-zero
+       problem when scrollbar completely fills range. (Patch
+       from  Matthias Clasen, #57047)
+
 Thu Jul 12 13:53:28 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkevents-x11.c (gdk_event_translate): Properly

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 152ee095f512451866b7b46f1566ca584578cedb..b0fe0d9b42afcca7d12472faf5d4db90ffa688d7 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,15 @@
+Thu Jul 12 14:06:19 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Add
+       missing case.
+
+       * gtk/gtkcontainer.c (gtk_container_get_focus_chain): Fix
+       NULL/FALSE return value confusion.
+
+       * gtk/gtkrange.c (coord_to_value): Fix division-by-zero
+       problem when scrollbar completely fills range. (Patch
+       from  Matthias Clasen, #57047)
+
 Thu Jul 12 13:53:28 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkevents-x11.c (gdk_event_translate): Properly

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 152ee095f512451866b7b46f1566ca584578cedb..b0fe0d9b42afcca7d12472faf5d4db90ffa688d7 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,15 @@
+Thu Jul 12 14:06:19 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Add
+       missing case.
+
+       * gtk/gtkcontainer.c (gtk_container_get_focus_chain): Fix
+       NULL/FALSE return value confusion.
+
+       * gtk/gtkrange.c (coord_to_value): Fix division-by-zero
+       problem when scrollbar completely fills range. (Patch
+       from  Matthias Clasen, #57047)
+
 Thu Jul 12 13:53:28 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkevents-x11.c (gdk_event_translate): Properly

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 152ee095f512451866b7b46f1566ca584578cedb..b0fe0d9b42afcca7d12472faf5d4db90ffa688d7 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,15 @@
+Thu Jul 12 14:06:19 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Add
+       missing case.
+
+       * gtk/gtkcontainer.c (gtk_container_get_focus_chain): Fix
+       NULL/FALSE return value confusion.
+
+       * gtk/gtkrange.c (coord_to_value): Fix division-by-zero
+       problem when scrollbar completely fills range. (Patch
+       from  Matthias Clasen, #57047)
+
 Thu Jul 12 13:53:28 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkevents-x11.c (gdk_event_translate): Properly

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 152ee095f512451866b7b46f1566ca584578cedb..b0fe0d9b42afcca7d12472faf5d4db90ffa688d7 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,15 @@
+Thu Jul 12 14:06:19 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Add
+       missing case.
+
+       * gtk/gtkcontainer.c (gtk_container_get_focus_chain): Fix
+       NULL/FALSE return value confusion.
+
+       * gtk/gtkrange.c (coord_to_value): Fix division-by-zero
+       problem when scrollbar completely fills range. (Patch
+       from  Matthias Clasen, #57047)
+
 Thu Jul 12 13:53:28 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkevents-x11.c (gdk_event_translate): Properly

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 152ee095f512451866b7b46f1566ca584578cedb..b0fe0d9b42afcca7d12472faf5d4db90ffa688d7 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,15 @@
+Thu Jul 12 14:06:19 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Add
+       missing case.
+
+       * gtk/gtkcontainer.c (gtk_container_get_focus_chain): Fix
+       NULL/FALSE return value confusion.
+
+       * gtk/gtkrange.c (coord_to_value): Fix division-by-zero
+       problem when scrollbar completely fills range. (Patch
+       from  Matthias Clasen, #57047)
+
 Thu Jul 12 13:53:28 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkevents-x11.c (gdk_event_translate): Properly

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 152ee095f512451866b7b46f1566ca584578cedb..b0fe0d9b42afcca7d12472faf5d4db90ffa688d7 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,15 @@
+Thu Jul 12 14:06:19 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Add
+       missing case.
+
+       * gtk/gtkcontainer.c (gtk_container_get_focus_chain): Fix
+       NULL/FALSE return value confusion.
+
+       * gtk/gtkrange.c (coord_to_value): Fix division-by-zero
+       problem when scrollbar completely fills range. (Patch
+       from  Matthias Clasen, #57047)
+
 Thu Jul 12 13:53:28 2001  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkevents-x11.c (gdk_event_translate): Properly

diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index b73529d1131d30edc199f79180dbe4da6146df33..73290acd5a2ae9570cbc4148766af4fd6a8f3a89 100644 (file)
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -2126,7 +2126,7 @@ gboolean
 gtk_container_get_focus_chain (GtkContainer *container,
                               GList       **focus_chain)
 {
-  g_return_val_if_fail (GTK_IS_CONTAINER (container), NULL);
+  g_return_val_if_fail (GTK_IS_CONTAINER (container), FALSE);
 
   if (focus_chain)
     {

diff --git a/gtk/gtkmenubar.c b/gtk/gtkmenubar.c
index d17952e953390527b2a5720b905e55da7812065d..15100d7de1f8462614f0bd629fdeede442f57711 100644 (file)
--- a/gtk/gtkmenubar.c
+++ b/gtk/gtkmenubar.c
@@ -484,7 +484,7 @@ gtk_menu_bar_hierarchy_changed (GtkWidget *widget,
   toplevel = gtk_widget_get_toplevel (widget);
 
   if (old_toplevel)
-    remove_from_window (old_toplevel, menubar);
+    remove_from_window (old_toplevel, GTK_WINDOW (menubar));
   
   if (GTK_WIDGET_TOPLEVEL (toplevel))
     add_to_window (GTK_WINDOW (toplevel), menubar);

diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
index 2883cbc3a2576ee0590cba1599bbce4e89c1c91f..cf8d427114717af813ce42fbc16acb30ac87c07d 100644 (file)
--- a/gtk/gtkrange.c
+++ b/gtk/gtkrange.c
@@ -1021,11 +1021,17 @@ coord_to_value (GtkRange *range,
   gdouble value;
   
   if (range->orientation == GTK_ORIENTATION_VERTICAL)
-    frac = ((coord - range->layout->trough.y) /
-            (gdouble) (range->layout->trough.height - range->layout->slider.height));
+    if (range->layout->trough.height == range->layout->slider.height)
+      frac = 1.0;
+    else 
+      frac = ((coord - range->layout->trough.y) /
+             (gdouble) (range->layout->trough.height - range->layout->slider.height));
   else
-    frac = ((coord - range->layout->trough.x) /
-            (gdouble) (range->layout->trough.width - range->layout->slider.width));
+    if (range->layout->trough.width == range->layout->slider.width)
+      frac = 1.0;
+    else
+      frac = ((coord - range->layout->trough.x) /
+             (gdouble) (range->layout->trough.width - range->layout->slider.width));
 
   if (should_invert (range))
     frac = 1.0 - frac;